Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:31:20 +0000 (13:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:31:20 +0000 (13:31 -0700)

Trivial merge